From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 2 Jun 2011 17:16:09 +0000 (-0700)
Subject: Merge: memory_full, gnutls improvements
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~3565
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=35e4730f3879c823a464fca7f2fe260f52b381bf;p=emacs.git

Merge: memory_full, gnutls improvements
---

35e4730f3879c823a464fca7f2fe260f52b381bf